Teleportation Cleanup & Cult Teleports Respecting Anti-Magic #11466
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Comment on lines
274
to
276
| // The nullrod by itself does not block cult/wizard teleports | ||
| /obj/item/nullrod/intercept_teleport(channel, turf/origin, turf/destination) | ||
| return |
There was a problem hiding this comment.
This is incredibly hacky, not sending the signal at all because its a nullrod. If you want certain components to block teleports, then it should be a flag on the component itself and should be applied fully. You need to be careful that the wizard hardsuit with magic protection isn't going to block the wizard from teleporting to the station.
There was a problem hiding this comment.
So as it turns out, I removed the INTERCEPT_TELEPORT for /datum/component/anti_magic, and just used .anti_magic_check() instead with self = TRUE, which allows us to exclude stuff on our person (like gem encrusted hardsuit) but include stuff like holymelons.
Rukofamicom
approved these changes
Sep 28, 2024
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
About The Pull Request
check_teleport()proc for when we want to pre-check teleports used primarily with hand-tele and teleporterforcedargument toignore_area_restrictionsas it was a misnomer.Why It's Good For The Game
Testing Photographs and Procedure
Screenshots&Videos
Blocked by a holymelon at the destination blessing the tile
Blocked teleport by being blessed
Blocked teleport due to tile being blessed
Wizard can teleport with full hardsuit
Changelog
🆑
code: Add check_teleport()
fix: Added more cult-related checks for teleports. Cults can no longer teleport holy items, etc.
fix: Clockcult teleport now respects blessing internally if it didn't already check
/:cl: